Unlock Properties bug fixed