srh bug fixing, unstable