fixing random issues