Issue #21: Fixed