fix a little bit more