Replace dodgy author helper with better one