Fixed message during re-sending. Closes #12 and #13