(wip) make check passes