Paperclip fix

Closes #24 and #118