Fixes the big bug, but still can't compile...