Fix for fragile props