Fixed issue 0000050