Version and fix a important bug