A fix by DiscoMcDisco