Fixed issue 24