Fixed issue #27