Fix halpager inlining issues

The fix is not that pretty ... but works