Fixed issue 12