Another fix. Hopefully last for a while.