Fixing bugs - :D