Fixed issue 428