Update: Little bugfixed on small fields