Fixed ctrl-p behaviour!