DAT-2182 What a beautiful prop id conflict you had there, my friend...