Fixed issue 272