Hacky fix for 1.7 behavior.