improved fix