Fixed for 1.5!