Fix for new style