Fixes frame loading order and promises