Note that this is a fix for a bug currently in master