Another fix by Mirko