Pull request related to #301