Another little bug, should do more testing before commits