Fixing possible bug