Apply @sbrunner's advices