Another small patch to the last added feature. *sigh*