Applied fix from http://www.yaronet.com/posts.php?s=141436