Fixed bug caused by broken merge, my bad