Conditional statements always help

So prop change doesn't get overwritten