fixed one bug - got another :(