Fix for issue spring-boot#2019