Added fix for ItemAdded/Removed events sometimes being delayed

Fix for #630