Fixed #3 [RandomCode] is now optional