Fix for single threaded samples