1.6 fallback after fix #6