Fixed issue 427