implemented workaround for serialization bug