Fixed fields causing bug