Re-added correct de-ser. code