Fixed field bugs