Fixed #62 which was broken