Fixing more