Better Bug-Fix #3