Fixed an issue with complete_next