Fixed issue #55