Better fix with @rwz's suggestion