adding rc1 compatible code