Fix Closure Serialisation Issue