Bug fix in Router where is was not calling next