fixup -- maybe solved. test it.