Fixed issue 29