Fix actually handling