[fix] https://jira.osiam.org/browse/BT-53