Fix wrong merge

Fixes #683.