Introduced bug #18, stopping for tonight