Temp modify till my pull request to rouge is accepted