Small bug fix with new setting