Issue 378 - Pick up