Preparing for test. Fixed Henk his half commit :-)