Fixing a bit more casing