Fix for inline variables