Fix for variable case