quick fix for the last patch