fix for all versions