Fixed version of 72ca37f9d6d875b87dd2ab41dac0b24e937b8e7c