Fix #5! Happy and tired now