Fix #941