Fix for public methods