updated to Peter's comment