fixing locking I hope