Fixed generated BUG