Changes for #1 bug