temporary fix due bug in production jira. Rollback later