hotfix + nokogiri implementation