Fixing flush bug