Finally fixed Done button bug