blocking on close bug fixed
Merge pull request #1517 from diegosarmentero/master

blocking on close bug fixed