this is how we actually want to handle this

would a util function for this help, maybe?