Fixed code review by @diunko