Minor revision from commit 46fc9986bf