Change with keyword to fix #13