Hopefully fixing my issue