Tried to fix Bug ;)