Final fix of paperclip