Correct bug, add test, need to do more testing though!