Issue #18: this should fix it