Fix for SH's comment on commit 77d8914