fixed setup_data