Bug-fixing task #1