WIP: fixed weird block nil issue