Return to orig state after fix of issue #5