Hurray for stupid easy fixes