Attached is a patch that works for me. http://paste.debian.net/243160/ I tried to minimize changes to the core code. Any comments or ideas on a better approach? Thanks, Amit