Fix from last meeting