Added code that will work if #260 is merged ...