Bug maybe fixed.....maybe