Fixes1.2

Release this or all hell will break loose.