Fix paperclip better