R16B crypto issue fixed