fixed: helpers