fix by thomas thomsen