fix bug from 1254