Fix bug due to wrong changes