Fixed for new code