Patch related to #301