Core: Bug fix .. please merge