Bug fix. Working now