Patch by Kenneth Johansson, 30 Jun 2003: