temporary hack to get back good performance, this needs to be studied (and optimized) in more details