Fixed problem with auto-formatting pre-handling.