Fixing my issues...