Try to solve http://issues.axonframework.org/youtrack/issue/AXON-211.