Fixed versions from Rainer