More messing round because EB does not appear to behave as specified