Button fix attempt #3