[FIX] improved fix a51e4289