Attempting to fix issues

- Attempting to fix issue #3