Bug fix, better results now.