fixed passing issue