Bugfix for the 4.0.1 release