try to better address #553