Temporarily returned hpp-checks