fix a little bit