Issue #2 - draft fix