Fixed, closes #54