Fixed for OF 0.8.0+