Final fix for friction