implement a fix for done button