Fixed issues with collector