One more bug fixed...