Fixed issue #277