Trying to fix the double problem