Fix for collection strategy