Fixed issue #213