could this be fixed in this pull req ?