Re-applied fix btn