Header dialog issues. Fix #49