get rid of locked state (closes #89)