fix the same as Daniel did