Fixed issue 28