fix for new versions