Fixed Guf's previous commit. Now working as intended