temporary fix till we resolve promise then problem (it doesn't call callback right away even if promise is already resolved)