BUG #1 Solved