Fix for stale bugs