Fixed issue 0000049