fixed REDBOX-238