bugfixed / clean