Improve the fix by using Single Thread Executors