Improved behaviour when it used to work but now doesn't