(hopefully) fixing problems I created when merging