Fix for commit dc525476c2e1b53f268259df1b331109008db55a