Fixed issue 25