Added minimal check