Added quick fix (very ugly) making Ovrigt not required.