|#1000| Fixing thousandth nasty bug