A clone from the vijava's svn project - to offer a bug fix.