refixed #1563