Fixed new picking