fix #549 to new specs