Fixed issue with invalid button lights on/off