Implementing the last of Joeri's comments.