Added hack to fix done button hiding