update from fanfix-swing