Fixed bug with Agreement