Implementing a check for an Issue #25