Fixed issue #148