rework #616

look #616 for more information