Fixed issue #78