Works on #72