Fix for the comments by @jglick