Fix shape code