Fix one and add another is*() function