Unlock Properties Bug Fixed