Fix bug introduced by find bug changes