Comment out AP check
Serialize bug