Try fix 241 (to be tested on dev server)