Controller implementation fixed