Fixed facade problem