Fix bug, test need to be added