Addition to prev. commit