Workaround for hoe crash