fixed issues by hank