Fix to Julius Manni's proposal