Fixed sapos bugs