FH5 Fixed Issues

Follow