Fixing few chartings