properly merged dries's commit