Fixed issue 14.