Issue #23 Fixed