Fix for public consumption