Patch #107 worked for me