resolving 1 bug