other fix & correct