Bug #1 resolution