So nice to be able to remove this kludge! \o/