#16 Fix transistion - Merci Alain :p