Prop Fixing Function