Fixed majior bug!!!