removed a bug maybe again