fixing some of the strange behavior that this system has started to exhibit