better handling of basic LDF