Fix for @on memoisation