Attempts to fix previous issues