Replace isfield with isprop. and bugs for r6 fixed!