Beta fix (37/44)

Beta fix