related to #36