Base check

Commit in version 1784