Made it work with normal oF distribution, rather than of64