refs #18 | fix a merge-related issue