fix after merge massacer