One more bug-fix