fixing fork mode