Crystal Jonathan lock-fix0241