Fixing a bit more