Final bugfix hopefully