Proper fix for future_go_live