fixed that not enabled properties are sometimes skipped