One more bug correction