Resolve TROVE-2017-002
issue