Attempting to fix a bug, but so far failing.