A fix for #154