fixed a little bit more