#1 bug fixes