References fixed