Reversed the last edit to debug