fix https://github.com/matb33/meteor-collection-hooks/issues/19 and fix https://github.com/matb33/meteor-collection-hooks/issues/11