Final bugfix for 1.6