This is already fixed for 7.1 wink