Properly fixed catch/pickup