Fix Janhouse's mess