Fixed locking user interaction bug