fix for second bug