Possbile resolution for #257