Fix for <change_format> suggested by Bjoern; Closes issue #38