Removed dependency on fixed field