#285 temporary solution with sameThreadExecutor()