JFG-316, JFG-318, Serialization Fix

JFG-316, JFG-318