fixed rc2 edge case and removed debug comments