4.0.4 - fixing bugfix that didn't work in 4.0.3