edited the commit to mimic the changes present in #1037

hopefully this fixes the conflict