Fix previous merge

Messed up the merge, hopefully fixed it now haha.