fixes #91
fix merge