Fix for #38 (Not serializable field)