Bug/214

Bug fix for issue/214