Fixed per Artem's PR comments