More debugging and typo in comment fixed