Fixed(?) controller response logic