Trying to catch more issues