Fixing weird bug, for real