Fixing old bugaboo's