Issue #48: Fixed