Adjusted to comments by @Silox (part 2 of 2)