make things work-ish as expected