custom controller fix