fixxing and unfixxing ... at least it runs