Small bug fix. Now working