pushed fix for async problem