Fixing PROPER detection