fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1431317&group_id...