Addition to commit 808f279