fixed double problem