Previous fix caused other issues, this is an improved fix

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>