re-applied fix to old file fml
(cherry picked from commit 43deeaa88dddc7b34a9b5581eba6820fd5ac887c)