One more time bug fix