Fixed Issue 358.