Fixed issue 481