Duplicate code eliminated (bug fix).