fix & improvement