Fix for continuous error spewing