Fix bug where fixed variables were not correctly classified