Hopefully it is fixed once and for all...