Solve issue with no check for now