#2254 proper fix