Fix to work in Chrome again