Enhancement: make sure to skip master