I'd like to see something to prevent this issue as well.