Fixed Issues!