#60 Should be working as intended