Issue #282, extra check