fixes bug maybe
fixes merge issue