Fix variables with important to be consistent - Fixes #2286