@kizu, those two conditions can be combined into one