Fixed for the next beta