fixes #3124 please test