Fix substitution bug
#10 Passcode protection