Fix bug, and add better that