locking changes for v0.1.2