Fix #Bug17 Settings