fixing bad merge (for issue #12)