Attempt to fulfil Mantis issue #68
More changes related to Mantis issue #68