little fix & rework