Legit fix for #136