Address Issue #18