First try at fixing #33