#6 fix variables