Fixing casing one more time