Added custom check. Not ideal yet, but hey.