Fixed issue #537