Fix for context sensitive data transfer