fixed last bug - I hope