bugfix to work with latest trunk