fixes addition
Merge commit '379b818a6f04b574a2edc592902f59e0218d7471'