fix for last bug