GROOVY-5918 Extra check