Fixes last part of #33