Fix214

Fix for #214