Fixed 2 bug of bug 322

Signed-off-by: Michel Verbraak <michel@1st-setup.nl>