Trying to fix cycle problems