Fix to #310