int-1435 quick fix