Revived leo's formatters fix from site