Fix for comments by @jglick