Fixed "Done" button issue