Fixed issue #272