fixed greedy warnings