Fixed issue 456