Fixing a little bit