Fix shape cycle