Fix broken merge (closes #467)