Follow-up fix to commit 1cee5a37 and issue #470. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>