Previously uncommitted fix