Issue #9: seems to now work