Just the first fix from 5c0151ebcc9ce6061c30d05e5a7dd5a789e71ee4