fix a problem introduced by last commit
fix a bug with settings