fixed those issues in 4e1f981