some changes as suggested by John Remijn <etmjrem@genesis.etm.ericsson.se>

Paul Siegmann <pauls@euronet.nl>