bug fixes;
pull request from hbs.