Fixing issues with 'single' mode.