This actually breaks some things. Need to think of a better way.