Final bugfix for 2.0.2.3