Fixed collector bugs
Fixed collector bugs