Changes from Pull request 324