Fixed or rather verified that marshaling issues are fixed