[FIX] Fixes #2252

Fixes #2252