Fixed issue #52