Improved maintenance of changes. Possible fix for #115.