Fixed bug, that Max found