Fixed issue #54-1