Critical Marshaller fix