BUG 2411: removed extra condition