Potenial fix for 'marshal data too short' error - Ref #685