Merge mayhems fix for #214