Bugfix
Removed serialize override