fixing bugfix: variable names now correct