Fixed locker bug
Tagged version 0.6.12