Closing issue #206