quick bugfix

should also rearchitect this eventually