Fixed, will merge tonight (~12 hours from now)