[UNSTABLE] Attempt to fix issues