Bug fix 90%