More robust - for #1