Per issue #37 - Change check method