fixing a little bit