Fixed saving attached fields