Hotfix for Andrii's latest commit