Fixed issue 205