Just committed a patch to the entertainer svn.

patch18012008.diff