Bug fix 2 sorry