STILL showing buttons when they should be disabled. Fixed.