Follow-up to (d62d89d)
Special Thank @Playtester