Fixed issue #1105, WebAPI