Fixed Ate bugs