Possbily a fix for #4