Attempts to fix - unstable