Issue #28 Fixed