Fixed issue 49