fixed a bit more