Bug fixed collection method