minor rework
fixed