fixing asynchronous...