#15: Remove duplicated check