Fix up helper for Luke