Fixes, remove after the console.log