Fixed and removed