#334: Always do what is right irrespective of

#334: Always do what is right irrespective of