Fix #138 by using toUpperCase() to test dataType