fixed some bug in the bugfix :)