first ubc_fix commit