Fixed end issue