fix else...then.