Bug/214

Twin of PR #218