Fix for cycle limitation