fixed #91 lock mechanism enhanced