updated for OF 0.8.3