Updated again according to Mark's comment