Fixing issues (Tested!)