Abstract controller fix