Fixed bug causing override_all to not work