Tims merge paperclip fix