Extension compatibility fix #3026