[FIX] Fixes incorrect merge 3e1d5be951fb8