fixed second bug