removed a bug maybe again again