Fixed issue 254