Fix from last revision