Moved barrier to prevent locking