Bug fix Done button