Fix bug in Allmate2