Fixes #37: Extra check