Fixed issue #133