well, don't know why this happens, but it does
this addresses the problem from the last commit at its root