Minor bug fixed on #25