Fixed issue 39