Fixed issue 478