Issue #18 - Fixed