Master nutty modify bugfixed