Added fix for serialize