Fixing bugs on SRTN