fixed fields improved