+ fix the source code to meet 2.12-SNAPSHOT requirements