Attempt #2 to fix button removal