little fix + less debugging