Fix Janhouse's mess (see comments on #1)