Fixed double combining bug

Closes #2