Actually fixed _both_ functions now