* updated to work with OF 0.8