Fix for bug causing infinite back and forth