Fix #44  May add a setting