Fix for shared helpers