Comment why this hack exists and improve it with @mourner code :)