attribution and a fix from author