Fixed with Code Review