Another bug fixed...