added manual check