Made flush locking optional