Fix workplace controller