Fix for Avie paste bug