Beautification
Strange fix required for arm7