Fix issue #213