Fixing issue https://github.com/tuplejump/stargate-core/issues/22