- Fixed issue #272