Bug Fix, variable assignation