Removed too much in previous commit, this one fixes that