New: Issue #2 is implemented