Fixed Pick Block

Closes #20