Attempt to fix the issues; Submit #1