Another workaround faster but less elegant