Added temporary fix with issue with serialization