Fixed Issue #13.