Fix and test for Issue akka#15022