Fix, now this should be working as intended