Fixed, closes #77