fixed passing bug