added eager commits to avoid NPEs