This would have avoided #923
This would have avoided #923