merge patch 1 to canary

don't know if i'm doing this correctly. but hey! thats my fork so nothing gets broken