Fixed issue #58