re #58 - Fixed merge conflict