* (bug 1398) patch by Thue Janus Kristensen that modifies the behaviour of the