bugs fixed

and again, it wasn't my fault :( lukasz forced me :( :( :(