Fixed Issue #16.