Fixed issue 13