Quick fix to buttons and spouts not clearing