Fix for use with 12.0.0-SNAPSHOT