Fixed this on #58