Workaround for broken OWB versions