Making sure this bit of code is actually necessary... if it is, then revert this commit