Slightly nicer fix for EBSL that maintains the old API