One more bug fix