Fix for cycle