Fix ugly instruction format