Fixing another bug