Even more special cases needed to fix #226