FIX: Fix fatal bugs in previous commit.