!skip fixed, was calling removed function