Quick and dirty patch to just make things work, no tests, and only for myself