Try to fix helpers