still trying to fix 3.0