ugly_fix: temporary solution