Solution for #1 bug