Attempt to solve issue found by Ivorius