More lock-bit safe guarding