Debugging and typo fix