Fix transition bugs (#195, #196).