fix merge, this time for issue #17