created #506 for this