Fixing some shenanigans I think