Trying to fix spring-data