fixes #320 - merge error