Fixed another warning and probable bug