this commit references bug #11