Intern patch

by Nick Slater