fix reference and limit messages