Initial fix implementation @Mamute.