Fix for helper