more checks as stated in #17