Issue #35: Fixed