Fixed picking up. Fixed #26.