Home Controller fix