Martin resolve #25