Fixed issue 72
Fixed issue 72