Better locking system, should work fine now