Fixed issue 499