Fixing errors, but may crop some features