Some kind of fix for #722
Just to see what happend