Made filling field a bit safer