Bug-Fix #1