SMN-69 Fixed encoding