Greedy bugs fixed