fixed form-settings-bh (git conflict)